Closes #1 Supports null callbacks

Some lint cleanup (tabs to spaces, etc.) as well as support for null callbacks.