Indentation fixes
Data Request Task has been modularized for Unit testing