todo cleanups
small fix
code cleanup (mostly whitespace)