Still not happy with the formatting; removed all "\r"s