Fix some lint warnings and errors.
Merge pull request #103 from cauchymop/lint_issues

Fix some lint warnings and errors.