spelling and cleanup