Fixed formatting As per review comments on #709