Added #sign_out and did some clean up