clean-up/refactoring - ver1, loc must be always defined