More organization on CSS