Updated: class documentation, codeReview