Cleaned up array to cleaner look