format and fonctionality

little better now