[TASK] Cleanups according to code style inspections
Merge pull request #52 from NamelessCoder/inspections

[TASK] Cleanups according to code style inspections