small cleanup
further cleanup