Refactoring
Refactoring, missing CamelCase
Prepared for localization and added es_ES translation