refactor

started comment cleaning, gentle code cleaning, organization