Feature/improve format