removed todo tasks and fully commented code