STY: Address comments.