Refactored comment specifications to define locator explicitly