Cleanup

This pull request just does some minor cleanup of models using new features introduced in more recent versions of wagtail.