Cleanups + tweaks