Minor cleanup and more user feedback