+ clean up the code