Minor code clean up
Updated class documentation
Removes saving and loging for increasing performance