Small changes to comply with coding standards.