Before refactoring to allow importing of module