Fix formatting, improve readability [skip ci]