Added some semicolons and other minor changes