Make coding style match guidelines.