Objectify
* Move functionality into a class
* Add extra attributes to logout shortcode
* Clean up code