Redbooth refactoring