[CLEANUP] Added todo docblocks and fixed spaces and comments