Heri | #3212 | Updating some message & cleaning up the code