refactoring
fix array