Refactor according to comments.