Slight DOM refactoring for future CSS stuff