Cosmetic code cleanup before merging into master