refactoring to remove warnings (vars to own file) re ADWolf:#1201