Auto code clean up