Formatting, additional fix for looping stuff