Refactoring code.
Refactoring code.

eric-haibin-lin/peloton,eric-haibin-lin/peloton,eric-haibin-lin/peloton,eric-haibin-lin/peloton,eric-haibin-lin/peloton,eric-haibin-lin/peloton,eric-haibin-lin/peloton