#20262 Cleaned the code