Removed redundant enclosing closure from all files