Tided up deps