Minor code & comments cleanup