update code to respect psr4