Small code clean and rename file