DEV-51 | Update following comments + Fix some grammar