Beginning to refactor