Code clean and format