Created a to do list and cleaned up some code