simplified objects

simplified passed in init object. renamed variables