clean up, improvements