small improvements according to comments of @stephencelis