Remove prints
Rename type to mode