Cleaned up the class a bit.