v1.2.3: code cleanup + improved calls delay