Cleanup in response to reviews, merge patches