Slight reorganization and spell check