Yep, i will do the changes in the above comments and squash the commits.