Updated class files with more descriptive commenting