* removed redundat brackets
* reduce scope
* tabs