A bit of tweaking to improve readability