Let's clean up this class