formatting + quick fixes