[AESH-245] refactored and corrected formatting.
Changed constants type
Merge pull request #70 from danielsoro/AESH-245

[AESH-245] refactored and corrected formatting.