Improve code spacing and indenting