Update to new coding standards