style and fix