Modernization

Cleans up various stuff. Nothing crucial, but it helps.