rm unused
add some blanks