fix tabulation & copypaste artifacts