Some quick refactoring, pointing custom font parameter to a single place (for easy switching)