remove unnecessary semicolons, other minor cleanup