Renamed and improved my bash functions a little