Adding response tidying
Added some comments to main methods