Readability and consistency improvements.