Code cleanup 2
printValueParams is fixed based on comments