Refactor Application :scissors:
v2 :up: