Issue #5 - Review the code according to the good practices