Removed the silly icon
Removed unnecessary code / comments