-fixed unused imports and refactored fragments to represent the fragment lifecycle in the source (top-down)
-further style fixes and removed some todo's