Merge pull request #45 from Edzelopez/RG-116

RG-116 Removed magic numbers, Fixed Indenting
RG-116 --Worked on issues