small improvements, clean up