Pushed GetIP into the object as well, cleaned up more