CLean up code
clean up code