Little more refactoring.

Refactored callbacks, now they're looking way better.