Adding some prettifying