Remove comments
Add valgrind testing