Added some styles and removed unneeded code