[Style] Patricio's Modifications