Minor syntactical changes