- some cleanup based on review feedback