Simplified the class even more.