Merge pull request #8 from apache/feature/codecleanup

NOJIRA code cleanup