clean up, add semicolons