Adding in unregister method
Formatting cleanup