Pull request comments fixed