clean up getdata controller
clean up controller
minor clean up
Merge pull request #3 from JamesLeB/dev

Dev