Kisebb refactor.