Merge pull request #12 from shouze/qa/fixes

Fixing some bad code quality.