Copy/paste bug and code styling

I'm not sure about ignoring 'silencing errors' warning but maybe it is reasonable in these cases.
If they has judged unnecessary I'm reverting them.