standards cleanup