Make registration types and ownership consistent. Run tidy.
Merge pull request #45 from mvano/RegistrationCleanup

Make registration types and ownership consistent. Run tidy.