References refactored