Very minor cleanup and readability changes