Code style optimized