avoid returning useless `null`
improved phpdoc comments