Refactor comments
Refactor adopt method
merge