Some syntactic cleanup