Major change: Spacing, Comments, Matching
Fixed all deprecation/feature issues
Merge pull request #53 from ayaigame/cleanup

Cleanup