Added some prettification