improve
minor changes