No need to double store information
Cleanup
Better registration message