Processed some feedback on pull request