Fixed more duplicate code issues
Merge branch 'master' of https://github.com/AaronTR/SLU_Software_Engineering_Group_A