Minor formatting and TODOs