adding comments about refactorings
fixed commenting merge error
Merge branch 'swap2' of https://github.com/isidor3/CSSE375-SWAP into swap2