Cleanup, minor tweaks