Doing some refactor housekeeping