Better structure for CSS