Improved client-side; Reverted strtoupper helper