Refactoring & fixing home quotes