Addressed comments to the last commit