CS_1400_Lab_7_RRP

More refactoring