Minor refactoring
Minor refactoring


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