Commit 8: Data into array minus repetition/refactored