Some small syntactical cleaning