Refactoring. Moved fonts to the constant class, renamed vars in test, reduced nesting in calculating number of weeks