removed unused icons
reformatted code