Added Name to .cpp and fixed minor formatting in .h