Clean up registrations code smell

Thom Wiggersrequested to merge
registrations-code-smell into master

Short description

Cleans up the code of registrations a bit.

Merge request reports