Added TODO list, cleaned up code and made some minor changes