- More whitespace cleanup (reverted back to how I had it)