User comments and refractor
merge