Finished refactoring
Finished refactoring

Ghatage/peloton,amaliujia/peloton,amaliujia/peloton,Ghatage/peloton,amaliujia/peloton,Ghatage/peloton,amaliujia/peloton,Ghatage/peloton,amaliujia/peloton,amaliujia/peloton,amaliujia/peloton,Ghatage/peloton,Ghatage/peloton,Ghatage/peloton