Removed TODO Items
cleaned up some comments
Removed redundant parameter
added TODO item