minor changes in constructor