code cleanup, defined constructor