Added some aesthetic changes