Refactored solution to meet our coding standard

The solution did not meet our coding standard, so I refactored it to
meet the standard.