syntax errors, clean up code