Refactoring + CSS.