Tidied NameFinder.java
Removed some useless classes
Made return of info tidier with some formatting