[TASK] Some cleanups and missing argument passing
Merge pull request #12 from NamelessCoder/cleaning

[TASK] Some cleanups and missing argument passing