cosmetics + code cleanup