Merge "Remove redundant code logic to improve readability" into main