cosmetic changes, move badly placed comments