Less code repetition
Comment
Comments
Fix registration bug