Use more consistent code spacing and formatting