Revert 6641d5c93f2ccffea77f82d48d1adc6e76809bf2
Improve comments and coding style