Respond to kyles comment and refactor