Remoed unneeded scripts, generalized identation