Bit more clean up of refactored font & text classes