refactor, fix intend