Cleaned up Array -> List