Add missing smemicolons and remove unnecessary returns