Yes, will refactor the code in a separate PR.