Code-style cleanup