Add DocBlocks for class variables, remove unused class variable, fix incorrectly named class variable