CSS cleanup and structure