Small code cleanliness bits