Implement @cvan comments and suggestions.