code calls cleaned up