optimized code style