Updated recent changes to comply with coding standards.