code & comments cleanup