terminal: misc cleanup
terminal: misc cleanup

visualfc/delve,go-delve/delve,derekparker/delve,ggndnn/delve,alexbrainman/delve,alexbrainman/delve,visualfc/delve,visualfc/delve,dr2chase/delve,dlsniper/delve,aarzilli/delve,alexbrainman/delve,dlsniper/delve,go-delve/delve,ggndnn/delve,aarzilli/delve,derekparker/delve,aarzilli/delve,go-delve/delve,go-delve/delve,dlsniper/delve,derekparker/delve,dr2chase/delve,dr2chase/delve,go-delve/delve,ggndnn/delve,aarzilli/delve