some cleaning
-removed old TODOs
-changed some tabs to spaces