- some code cosmetic changes