Add some moose best practice stuff that was missing.