Removed some clutter from API Controler
Removed some clutter from API Controler

Still a lot to do here ...

imdanshraaj/screeenly,stefanzweifel/screeenly,imdanshraaj/screeenly,stefanzweifel/screeenly,imdanshraaj/screeenly,stefanzweifel/screeenly