Code reformatting and PHPDoc fixing
Code reformatting and PHPDoc fixing