refact - suite