Code/CSS cleanup