I find the original code much more readable. Can you revert this.