Code cleanup
Improved callback handling
Package bump