Few tweaks and cleanup