Merge pull request #53 from NamelessCoder/master

[TASK] Cleanups according to code inspections