Redundant code removed from Android App. Small improvements