missing semicolons & cleanup