Issue 3658 Cleaner Code