Continuing to modify code cleanliness