Awesome refactor
Working on foreach