Complete cleanup with contains, getElement, and getElementFrom
getElement -> getElementFrom: Multiple minor changes