Scott fixed coding standard issues