Update

Changed the style and optimize