commit for branch switch
Finished refactor