Updated friend and library formatting