Trying to get code in compliance with PHP style guides