Added font size support. Small refactoring.