style fixes and TODO cleanup