Android routine re-factory