close #2
Remove SPAM + rename some vars + cleanup a little