Cleaned up the class
More cleaning up