Agreed on the whole PR, could you please fix the formatting?