Implement suggestions from @zuzak readthrough