FineCal: Small refactor