Added TODO sections; Cleared code; Added notes and comments;