Well done extracting a class!