Fixing some bitrot, prettyfication