Update styleguide and implement a few fixes as a result