refactoring
Merge branch 'master' of https://github.com/lingz/cs209-ass1