Simplify element locator code
Fixing outdated annotation class comment