I will check and apply your comments in next commit