First readability improvements on the original source