Code-style improved