Space and indentation cleanup