Changed on call syntax

Made on call syntax easier and more legible.