refactor according to hound CI