More syntactic cleanup