Android Helper Refactor