Cleaning up a little of the first part of this task