Proper calling of callbacks

To keep code DRY