Added favicon and cleaned up code