various minor edits (unused variables,  unused imports, whitespace, wiki links)