Cleaner Code :)
Merge pull request #290 from rockincolton/patch-2

Cleaner Code :)