Updates to spacing and indentation