Few more minor tweaks for cleanup