Refactored Home Controller