code cosmetics and cleanup after merge