remove unnecessary variables, add spaces, small bits of cleanup

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