Some indentation corrections and small changes