code clean up + updated test results for notebook