small cleanup
small fixes