simplify presentation and polish