Text-domain, code cleanup, and more