Issue3658 Cleaner Code