removed todo and fixed whitespace