Styles refactoring and reorganization
Styles fixes