update show pattern
clean up
refac names