Address pull requests comments