Style changes and correctness changes