refactored the urocell chapter