Finally went through it. Here are my comments.
Additionally may I ask you to check whether in all file we use "spaces" instead of tabs? I think we need to be consistent and just use spaces everywhere (4 spaces are fine IMHO)
tabs are already moved space in the modified recipe files. remaining will handle as part next set of changes
tabs are already moved space in the modified recipe files. remaining will handle as part next set of changes