Enhance code style