Update to match current styleguide