update code to use psr4