kantrowtiz refactor