code clean and comment