hand total done, other method refactors