syntactical improvements