More cleanups
Minor change