Simplifiyed the Rhinorunner class