Improve coding style and eye-catching