Polishing code/comments