Optimize code style