Cleaned up things

Cleaned up the class, and added more to the documentation