Clean The Code Again