Code-style fixed