s: clean indent, rm includes using std