Minor - Fix notice messages. Undefined variable issues.
Minor - Code cleaning and style
Minor - Code style
Merge pull request #380 from ilosada/minor_exercice

Minor exercice