Clean up the code locally

Need to be cross check with scram