Refactor CSS Part I