Delete unnecessary comments
Add callback, for finding out buddy id
Minor refactoring