Refactoring properly this time