cleaning up for better code, cosmetic
Merge pull request #63 from Engidea/master

cleaning up for better code, cosmetic