Integrated suggestions from alvarotrigo's review