deleted multiple debug statements and added some todos for code refactoring