Code style improvement