Refactor
Removed unused class
Change modifier methods
Start using Android Annotation in Fragments