optimization
reformat
trying to fix tests