Removed static functions and stored them in modules.py