Cosmetics: code cleanup