clean up and show logic