Removing unnecessary throws clauses.  Fixing spacing.  Adding some do