Cleans up code, adds comments, updates todo.