- Remove unused import;
- Remove unused variable;
- Correct indentation.
Revert some changes.
Merge pull request #10 from fpirola/master

Cleanup code