Code standards cleanups