Adding rwhois and cleaning up code