Removes some unnecessary initialization and adds helper.h.