fix style & code