small cleanup while onboarding this repo
resolved merge conflicts