Code styled and organized
Merge pull request #4 from Sekhmet/master

Code styled and organized