Style fixes, use done.bind instead of a wrapper