moved some more member init to constructor