Refactoring with help from @mikelikesbikes