cleared old todos, cleaned code