cleanup bashisms