implement comments from Amin
formmatting