zhang250 & zhou86: final iteration

Completed refactoring & commenting