main tiny refactor