Code and theming cleanup.