remove uneeded variablesl, add spaces, small bits of cleanup

A small pull that cleans up unnecessary variable, unused imports, some spacing, etc. Just tidying up the code base a bit.