Simplify find_device_element_by_name_or_id
remove unecessary functions, fix wording
clean, rename
Merge branch 'cleanup' into appium