Removed unused statements and whitespaces
Merge pull request #255 from toin0u/patch-4

Removed unused statements and whitespaces