Code makeover
Merge pull request #1 from darkowlzz/makeoverCode

Code makeover