Changes to explicit return types based on feedback from pull request.
Changes to explicit return types based on feedback from pull request.