Removed unnecessary block scopes