Improved code quality
Merge branch 'master' of https://github.com/Jcamilorada/Simulador