Code cleanup
Merge pull request #1 from gen0cide-/patch-1

Code cleanup