code clean up and readme update