koordinator cleanups (ca 80 characters per line)