Yeah, having just a single class seems better.