code standards cleanup