refactoring, made static classes static