Removed more copy-and-paste HTML generating code