Improve use of best practices

Improve use of best practices, including the use of single quotes, and
method regex.