cleanup
minor changes for cleanup