cleanup, tweaking