minor cleanup and a todo