Tick 4 Formatting

Slightly tweaked indentation
Removed TODOs left behind.