moved some members init to constructor