Make more changes to reflect the Styleguide