RG-116 Removed magic numbers
RG-116 Fixed indenting
Merge pull request #45 from Edzelopez/RG-116

RG-116 Removed magic numbers, Fixed Indenting