Fixing typos and cleaning up docblocks