refactor to remove all static except in the composer script
more code coverage for dev mode