Updated for coding standard