removed no-longer existng todo comment
Rearranged stuff