cleaned up friends scaffold