cleanup whitespace
adapt to current master