Merge "Perform minor code clean up" into main