refactor homecontroller + UT