Clean up, syntax experiments