review methods no longer use hardcoded vars
some more instances of programme