Fixed code formatting and added various TODOs