Refactor registration
Merge pull request #1 from dennylee/clean-up

Refactor registration