compact code

compact code