some cosmetic cleanup, fixing consistency issues with setup and a bit of inline documentation