Moved arrays into a class