Insta refactor