Cleaned code
Cleaned name
Fixed last few lines
Updated task list