few clean up