Went all Janitor on the poop

Didnt want to have to explain to JClements the poop structure...We can chhange it back.