Cleaning up and added TODOs