removed todo, cleaned things up a little