Replace index-loops by range-based loops