CB-5082 Minor changes

-Added, proper indent (4 spaces).
-Removed, trailing whitespace.
-Fixed, double callback assignation.