DF Removed old todo comments and some styling changes.