cleaned up singup code