Updated todo
More cleanup