Like, 100% formatting updates (it's been a while...)