Removing log, simplifying callback