Changed constructor implementation to a .cc file