more cleanup on parameters