Did some prettifying