removed globals and init file