naming of methods, constructer updated