cleanup
minor changes