small refactor, shouldn't affect anything.

Signed-off-by: crynobone <crynobone@gmail.com>
trivial whitespace and code cleanup on teardown.

Signed-off-by: crynobone <crynobone@gmail.com>