improvements due to feedback from @smalyshev