cleanup
minor additions