Removed unnecessary cruft, fixed some typos