Removed duplicate class definitions.
Fixed typos.