Misc cleanup and improving script output