Correct checkstyle "Line is longer than 130 characters"
Improved shutdown (only shutdown our own instances)