Tweaked for coding standard compliance