small cosmetic tweaks

just cosmetics. no funtional changes. 
I want to keep it simple here for general purpose.