Making some of the Antonio's recommendations
Version 2 for review