minor cleanup
minor changes