brought source format closer to Zend Coding Standard