Merge pull request #116 from abelsiqueira/refactoring

Refactoring the code
Improve initialization of dictionaries