Refactor of css