Refactoring / CSS