AND-3136 - Changed if/else to ternary operator to make less verbose and changed onloadhandler function to CemelCase onloadHandler