code clean and update dev plan