Auto code clean up done