You have a point. Made this change and related changes in the same class.