Readability improvements (thanks to Cale).