minor this. / final / other cleanup
reformat