formatting and TODO removal