Spacing and indentation fixes