Minor syntactic modifications