[CLEANUP] Added todo docblocks and fixed spaces and comments
Merge pull request #7 from Shade634/cleanup

[CLEANUP] Added todo docblocks and fixed spaces and comments