Added requests handling and structure change

blank line before ```return```