Code/comments cleanup