clean up in code - part3