slightly better (I'll work on think of smth better if u want @APixelCat) also consolidated the blocks a little
