Cleanup the code by removing unecessary blanks lines and unused properties.
Merge pull request #113 from Sukei/master

Code cleanup