Found text error and doing some minor cleanup.