#334 cleanup of console.logs
#334 comment cleanup.
#334 clean-up and test alignment