Clean up of project and refactoring of Array generator