refactor suite utilities