Various refactoring and fixes in the style crate