Moved tone setting code to Util