add var and semicolons to some statements
cleanup