remove all occurences of find and improve syntax
Merge pull request #4 from vinsol/some-code-cleanup

Massive Controller Code Cleanup