quick code/comments cleanup