cleanup
simplified format params .... requires heavy refactoring