RG-116 Removed magic numbers, Fixed Indenting