Minor tweaks and cleanup