A little cleanup & marked TODOs