Refactoring to use AndroidAnnotations