Code standards cleanup