Adjust for coding standards