Refactoring patch from eugenioclrc at gmail.com
Refactoring patch from eugenioclrc at gmail.com

brainsqueezer/fffff,brainsqueezer/fffff,brainsqueezer/fffff,brainsqueezer/fffff,brainsqueezer/fffff,brainsqueezer/fffff