whitespace cleanup and skip acl check if acl doesn't exists (c. line 125)