Refs #369: format code; remove empty blocks; remove HTML element names from selectors