Fixed some stylistic issues and removed finished TODOs