Adding todos to clean up code