Refator activity lifecycle