cleean up
clean ups
removed un-used imports
Comments added
TODO
Merge remote-tracking branch 'origin/master'