making it better
clean up