Updated for PSR-2 code style compatibility.