went through everything and did some cleanup and fixing
Merge pull request #3 from CraftOfClans/cleanup

went through everything and did some cleanup and fixing