formatted general
Fomratting
small adaptation