Fixed return statements

Added return statements to callbacks for consistency