fixing global declaration, by moving to modular level from class"