Shorter MainActivity with additional classes