Fix styleguide based on @cremno's input