Updated code after codereview input on GitHub Tracker.