Clean-up

Took care of some sloppy coding and removed some unneeded TODO lines