Refactoring ! :smile_cat: