cleaned up code, updated todo list