Improved refactoring :smile_cat: