More prettifying

Mostly visual changes