code cleaned and prepare to be pulled