Format clean-up before v3 submission
Disable valgrind
strlen not needed