Removed arrays and moved to public