major clean to p18 ruby, there was some unnesary gunk