style & code fix