Remove unused property
Some refactors to Locator helper
Add multiple output format