Fixed remaining PHP_CodeSniffer reported errors (Return comments and last line)