Improved readability and one more round of cleanup