I tried to clean up a bit. Yet to figure out a nice layout for this space...