refactor/cleanup HTML/CSS