Completes the styleguide implementation on this branch