Refactor based on suggestions.