Cleaning up

Clean up comments, memberships, user decorator, model, and specs