remove trailing comma from doc
callback style
style
style. removing unused code
style
style
style
resolve conflicts
Merge pull request #1774 from danielb2/callback.standardization

Style fixes