more small cleanup
refactors, little bit of style