Quick code refactor.