:poop: beautified some things