put inside a static class
removed all functional references