Added a couple of TODOs, finished cleaning up
Added a couple of TODOs, finished cleaning up

webstream-io/jobsworth,digitalnatives/jobsworth,digitalnatives/jobsworth,rafaspinola/jobsworth,webstream-io/jobsworth,xuewenfei/jobsworth,ari/jobsworth,digitalnatives/jobsworth,xuewenfei/jobsworth,webstream-io/jobsworth,xuewenfei/jobsworth,ari/jobsworth,digitalnatives/jobsworth,ari/jobsworth,ari/jobsworth,xuewenfei/jobsworth,rafaspinola/jobsworth,digitalnatives/jobsworth,rafaspinola/jobsworth,rafaspinola/jobsworth,webstream-io/jobsworth