PHP5.3 compat and PSR whitespace fix