Minor improvements. Converted accidentally inserted tabs to spaces.