added todo
removed some whitespace