Good suggestion. Just did those changes since they makes sense.