Improve nameing
Simplify locating function