Cleanup, tweaks