Updated PR review comments
Updated composer.lock file