Finished refactoring
Finished refactoring


Former-commit-id: b654d7a8c64577ff6b446a3d5be4508fd7d7ee38
omegaga/peloton,ranxian/peloton,omegaga/peloton,ranxian/peloton,larryxiao/peloton,larryxiao/peloton-1,amaliujia/CMUDB-peloton,omegaga/peloton,amaliujia/CMUDB-peloton,omegaga/peloton,omegaga/peloton,amaliujia/CMUDB-peloton,amaliujia/CMUDB-peloton,amaliujia/CMUDB-peloton,larryxiao/peloton,larryxiao/peloton-1,omegaga/peloton,ranxian/peloton,omegaga/peloton,ranxian/peloton,larryxiao/peloton-1,larryxiao/peloton-1,larryxiao/peloton,amaliujia/CMUDB-peloton,larryxiao/peloton,larryxiao/peloton,amaliujia/CMUDB-peloton,larryxiao/peloton-1,larryxiao/peloton,larryxiao/peloton,ranxian/peloton,larryxiao/peloton-1,larryxiao/peloton-1,ranxian/peloton