Added some cleanup style