further cleanup in parameters