Cleaned some code and added a lot of TODOs