removed more simple variable names and made them dynamically generated