Fix (almost) all style issues