added constructors, deleted unneeded code