minor syntactical cleanups