Refac and comments.