smaller changes in con-/destructors