Cleaned up logic and removed web font