FIX: Removing printf() statements