refactor(#4): majo refactor