ran beauitfier, changed modules to singletons.