Minor edits to correspond with new header/cpp files