Some small changes to ensure compatiblity with the psr2 coding standard