Implemented PR review comments