simplify some code
begin extending the format supported