More prettifying of code