Switched to android annotations
Some refactoring