Fixed indentation and return callback