Modified to static class and fixed in_array issue

Not sure why I had it as a class