minor update making code more compact.