Refactoring
Convert to array