Readability improvements to some PHP classes