Tidy up & added TODOs