Removed unneccesary print statements
Added TODOs for refactoring work