Refactoring upon revision: couple of changes by arctouch-diegosantiviago's suggestions.
Refactoring upon revision: couple of changes by arctouch-diegosantiviago's suggestions.