Removed a fixed TODO.
Tidy up and refactoring