Refactor and redid merge conflicts
Refactor and redid merge conflicts

NUSComputingDev/nuscomputing.com,NUSComputingDev/nuscomputing.com,NUSComputingDev/nuscomputing.com,NUSComputingDev/nuscomputing.com