home style refactor