Community show cleanup pt 1

#4 Somewhat better, needs a bunch more work though