cleanup based on github review