This is how it should have been written from the start.
Keeping IDE happy.
More simplification.