clean and fix style to match