some minor clean up idk