whitespace cleanup and fix return to continue