Clean up some syntax issues