Code-style improvement