Refactor

Not sure what this comment means... can you rephrase?