Lots of code cleanup
Lots of code cleanup
cleaned up code. added extra model finders