Adjust for my coding standard