WIP: minor bash cleanup