Readability improvements as suggested by Markus