Code cleanliness tweaks