Attempting to refactor