optim-like types for displaying progress
more meaningful variable names
cleared legacy file