Cleaned up a few more variables

Just did some very generic maintenance. Deleted some unused variables,
fixed spacing, etc.