Cleanup + readability [skip ci]