Made code beautiful

...and cleaned up unneeded code