made a few small changes to structure
poop