cleanup whitespace and small tweaks