Cleaning source, minor tweaks