styles and types refactoring