Renamed vars, extracted defaults, changed prints
not much