Assorted refactoring and migrated from Class:Tiny to Moo;