Cleaned up this class a little bit.