small code cleanup + fixed debug output buffer overflow on jenkins...yeah -.-