styles refactor;