Refactor home style