removed a todo comment, changed last 2 lines