Fixes: #1723 CodeSniffer error : 'return;' is not allowed
Fixes: #1724 CodeSniffer error : do while is triggerring errors