Code cleanup, removed unused css variables and fixed some spacing.