Better Implementation for Dynamic Locators

This update allows you to change a dynamic locator within the same class instance
Formatting is also easier to read