Improved PHP 5.4 standards compliance
Whitespace cleanup