Only cosmetic code cleanup