Remove unnecessary closures and semicolons