high level refactor

removed sysout, TODO, comments from the code.