Some polishing.

Change font to Light. Removed some redundant code.