typos and removals of unnecessary code
(#20)