Fixing code formatting and removing todo