Neated up the loop