Larz/cosmetic tweaks

@njx please review.