Better seperation of concerns for Android