cleanup
minor improvements