Latets commit code clean up