Cut lots of fat, and practice good code.#4

datkat21 merged 1 commit intodatkat21:masterdatkat21/html:masterfrom

SpcFORK:masterSpcFORK/html:masterCopy head branch name to clipboard