Trying to clean up and dry up code.